[Feature] [Bugfix] 资源包有关优化与修复 #4980
Conversation
|
需要懂其他语言的人完善 i18n |
在BMC4中测试时发现BMC4会判定所有资源包兼容，与原版表现不符，会导致启用/禁用功能失效，故添加警告
HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcepackFile.java
Outdated
Show resolved
Hide resolved
|
我下载了 Translations for Sodium，放在 1.21.9~1.21.11 的资源包文件夹内，启动器会显示「游戏版本元数据缺失」。1.21.8 和 1.21.1 正常。不知道是不是 bug。 |
Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com>
Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com>
确实是，我在修 |
…esourcepack-enhancement
Solved |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 47 out of 47 changed files in this pull request and generated 3 comments.
Comments suppressed due to low confidence (3)
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/UpdatesPage.java:305
- In the UpdateTask constructor, the lambda on line 295 captures the
isDisabledvariable and usesModManager.DISABLED_EXTENSION. While ModManager inherits this constant from LocalFileManager, it would be clearer and more maintainable to useLocalFileManager.DISABLED_EXTENSIONsince this code now works with generic LocalAddonFile instances that could be from ResourcePackManager as well.
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java:164 - This method overrides LocalAddonFile.setOld; it is advisable to add an Override annotation.
public void setOld(boolean old) throws IOException {
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java:103
- This method overrides LocalAddonFile.getFile; it is advisable to add an Override annotation.
public Path getFile() {
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ResourcePackZipFile.java
Outdated
Show resolved
Hide resolved
# Conflicts: # HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java # HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
Calboot
changed the title
# Conflicts: # HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java # HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java # HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
# Conflicts: # HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseForgeRemoteModRepository.java # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/PackMcMeta.java # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthRemoteModRepository.java
# Conflicts: # HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AddonUpdatesPage.java # HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/CheckUpdatesTask.java # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java
# Conflicts: # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModLoaderType.java # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java
|
|
||
| private void setSelectedEnabled(List<ResourcePackInfoObject> selectedItems, boolean enabled) { | ||
| if (!ConfigHolder.globalConfig().isResourcePackWarningShown()) { | ||
| Controllers.confirmWithCountdown( |
There was a problem hiding this comment.
confirmWithCountdown 应当仅用于风险极高的场景，比如我们对于非法用户名使用该方法的原因是非法用户名会有很大概率导致高版本游戏崩溃，所以我们通过它来警告用户这是一项高风险操作。
但是禁用资源包的风险性远远没有这么高，甚至还不如禁用模组的风险高，我认为在这里使用 confirmWithCountdown 完全是在滥用。考虑到我们在禁用模组时都没有提示，我认为现在在这里加提示的必要性很低。
| } | ||
|
|
||
| @SerializedName("resourcePackWarningShown") | ||
| private final BooleanProperty resourcePackWarningShown = new SimpleBooleanProperty(false); |
There was a problem hiding this comment.
这些东西没有必要放在 GlobalConfig 里。GlobalConfig 里放的东西要么是和用户平台相关的（比如 Java 列表），要么是用户许可等要求每个新用户确认的东西。常规的内容应该放在 Config 而不是 GlobalConfig 里。
| private final String pageUrl; | ||
| private final String iconUrl; | ||
| private final IMod data; | ||
| private final RemoteModRepository.Type repoType; |
5 participants
具体改动
LocalAddonFile和LocalFileManager<T extends LocalAddonFile>，使更新对于模组以外的东西（如资源包和光影包）也能适用，从而实现了资源包更新（不保留旧版本）